<!DOCTYPE html>
<html lang="en">

<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
    <title>Document</title>
    <link rel="stylesheet" href="../css/reset.css">
    <link rel="stylesheet" href="../css/index1.css">
    <link rel="stylesheet" href="../css/repeat.css">
</head>

<body>
    <div class="header w">
        <ul class="navBar">
            <li>
                <a href="">link_01</a>
                <ul class="subNav">
                    <li>sub_01</li>
                    <li>sub_02</li>
                    <li>sub_03</li>
                    <li>sub_04</li>
                </ul>
            </li>
            <li>
                <a href="">link_02</a>
                <ul class="subNav">
                    <li>sub_01</li>
                    <li>sub_02</li>
                    <li>sub_03</li>
                    <li>sub_04</li>
                </ul>
            </li>
            <li>
                <a href="">link_03</a>
                <ul class="subNav">
                    <li>sub_01</li>
                    <li>sub_02</li>
                    <li>sub_03</li>
                    <li>sub_04</li>
                </ul>
            </li>
            <li>
                <a href="">link_04</a>
                <ul class="subNav">
                    <li>sub_01</li>
                    <li>sub_02</li>
                    <li>sub_03</li>
                    <li>sub_04</li>
                </ul>
            </li>
        </ul>
        <div class="searchBar">
            <input type="text" class="searchCon">
            <a href="" class="searchBtn"></a>
        </div>
    </div>
    <div class="box"></div>
</body>
<body>
    <p>你好!今天星期五,天气真好,去钓鱼</p>
    <p>hahaheihei</p>
    <p>vscode演示</p>
    <p>1111</p>
    <p>22222</p>
    <p>0606</p>
    <p>提交代码到远程代码仓库1</p>
<<<<<<< HEAD
	<p>修改了index.html,程序员B</p>
	<p>再次修改index.html,程序员B</p>
=======
    <p>修改了index.html,程序员B</p>
    <p>我也去修改了index.html,程序员A</p> 
    <p>再次修改index.html 程序员A1111</p>
>>>>>>> 4db6db6c506b73368f13b86e3fb595415660aca1
</body>
</html>